[automated] Merge branch 'release/3.1' => 'master' #26994

dotnet-maestro-bot · 2020-10-17T00:10:31Z

I detected changes in the release/3.1 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/3.1 by the following committers:

halter73
dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/3.1
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-master

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.1-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-master

or if you are using SSH

git checkout -b merge/release/3.1-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-master

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…016.1 (dotnet#26973) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.10 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - System.Drawing.Common: from 4.7.1 to 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Internal: from 3.1.10-servicing.20513.6 to 3.1.10-servicing.20515.2 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.10-servicing.20514.5 to 3.1.10-servicing.20516.1 (parent: Microsoft.EntityFrameworkCore)

) * Fix canceled ReadResult handling in Http1UpgradeMessageBody * Add UpgradeTests.DoesNotThrowGivenCanceledReadResult

ghost

Auto-approving branch merge.

ghost · 2020-10-17T00:10:40Z

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

…016.4 (dotnet#26997) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.10 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Internal: from 3.1.10-servicing.20515.2 to 3.1.10-servicing.20516.1 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20516.4 (parent: Microsoft.EntityFrameworkCore)

…build 20201017.1 (dotnet#27000) [release/3.1] Update dependencies from dotnet/aspnetcore-tooling

JunTaoLuo · 2020-10-20T17:52:01Z

Why is this going from 3.1 to master? Do we plan on back-porting it to 5.0 afterwards?

…build 20201019.1 (dotnet#27066) [release/3.1] Update dependencies from dotnet/aspnetcore-tooling

jkotalik · 2020-10-20T19:05:31Z

Yeah something seems wrong here... @dougbu ?

dougbu · 2020-10-20T19:22:34Z

Why is this going from 3.1 to master? Do we plan on back-porting it to 5.0 afterwards?

This is intentional because the merge distance from 2.1 to master is already annoyingly long. @halter73 did you already update the release/5.0 branch w/ something similar to 374f717 / #26914❔ If not, I suggest cherry-picking the change and doing the ask mode dance.

…020.2 (dotnet#27072) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.10 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.10 to 3.1.10 (parent: Microsoft.EntityFrameworkCore) - System.Drawing.Common: from 4.7.1 to 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Internal: from 3.1.10-servicing.20516.1 to 3.1.10-servicing.20519.3 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.10-servicing.20516.4 to 3.1.10-servicing.20519.4 (parent: Microsoft.EntityFrameworkCore)

JunTaoLuo · 2020-10-22T18:27:42Z

Okay, I'll do some work to make this merge.

The override is needed in 3.1 but not in master

dotnet-maestro bot and others added 2 commits October 16, 2020 19:34

Prevent WebSockets from throwing during graceful shutdown (dotnet#26914

374f717

) * Fix canceled ReadResult handling in Http1UpgradeMessageBody * Add UpgradeTests.DoesNotThrowGivenCanceledReadResult

dotnet-maestro-bot requested review from dougbu, halter73, jkotalik and Tratcher as code owners October 17, 2020 00:10

ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Oct 17, 2020

ghost approved these changes Oct 17, 2020

View reviewed changes

ghost added the auto-merge label Oct 17, 2020

ghost removed the auto-merge label Oct 17, 2020

Update dependencies from https://github.com/dotnet/aspnetcore-tooling …

ac92144

…build 20201017.1 (dotnet#27000) [release/3.1] Update dependencies from dotnet/aspnetcore-tooling

Update dependencies from https://github.com/dotnet/aspnetcore-tooling …

4ea3672

…build 20201019.1 (dotnet#27066) [release/3.1] Update dependencies from dotnet/aspnetcore-tooling

John Luo and others added 4 commits October 22, 2020 11:33

Merge branch 'master' into merge/release/3.1-to-master

81d269c

Remove unnecessary override

d8cc0b8

The override is needed in 3.1 but not in master

Fix WriteAsJsonAsync docs (dotnet#27108)

6ec7add

Resolve merge conflicts

98a94be

JunTaoLuo merged commit bda52f7 into dotnet:master Oct 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.1' => 'master' #26994

[automated] Merge branch 'release/3.1' => 'master' #26994

Uh oh!

dotnet-maestro-bot commented Oct 17, 2020

Uh oh!

ghost left a comment

Uh oh!

ghost commented Oct 17, 2020

Uh oh!

JunTaoLuo commented Oct 20, 2020

Uh oh!

jkotalik commented Oct 20, 2020

Uh oh!

dougbu commented Oct 20, 2020

Uh oh!

JunTaoLuo commented Oct 22, 2020

Uh oh!

Uh oh!

[automated] Merge branch 'release/3.1' => 'master' #26994

[automated] Merge branch 'release/3.1' => 'master' #26994

Uh oh!

Conversation

dotnet-maestro-bot commented Oct 17, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Oct 17, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

JunTaoLuo commented Oct 20, 2020

Uh oh!

jkotalik commented Oct 20, 2020

Uh oh!

dougbu commented Oct 20, 2020

Uh oh!

JunTaoLuo commented Oct 22, 2020

Uh oh!

Uh oh!

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.